Merge commit 'upstream/3.11.0.beta1' into 3.11/master
authorStephane Glondu <steph@glondu.net>
Fri, 17 Oct 2008 10:22:51 +0000 (12:22 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 17 Oct 2008 10:22:51 +0000 (12:22 +0200)
commitbf8d514f81ccfc288a21350ecbbcc1ea91adac22
treeab5d767adef761c589e0ac0570e56485492f332e
parent1ed5f738aae10715980864b8ad704c699f7efe6c
parent5dfb1ce8883f4b3457ae9da5c6dd1399bf132ef1
Merge commit 'upstream/3.11.0.beta1' into 3.11/master